From: Joakim <joakim@localhost.localdomain>
Date: Thu, 19 Aug 2010 07:35:40 +0000 (+0200)
Subject: merge the imagemagick branch to trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6910
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f1199a25afe8d009137b7e7084254504b91cff54;p=emacs.git

merge the imagemagick branch to trunk
---

f1199a25afe8d009137b7e7084254504b91cff54